Padding review

Ensure that the class structs of all subclassable
types have sufficient padding (standardizing on 8
slots, here).

GtkApplication
GtkWidget
GtkContainer
GtkWindow
GtkDialog
GtkApplicationWindow
GtkToolItem
GtkBin

diff --git a/gtk/gtkapplication.h b/gtk/gtkapplication.h
index 253644376dde727f682bd6534300cf1fe82abd5d..9678b6bf382db22dd951f3e55c0352470cd3c7f0 100644 (file)
--- a/gtk/gtkapplication.h
+++ b/gtk/gtkapplication.h
@@ -65,7 +65,7 @@ struct _GtkApplicationClass
                           GtkWindow      *window);
 
   /*< private >*/
-  gpointer padding[12];
+  gpointer padding[8];
 };
 
 GDK_AVAILABLE_IN_ALL

diff --git a/gtk/gtkapplicationwindow.h b/gtk/gtkapplicationwindow.h
index 7f243ee555cde17b92ccad419fefbb58406d7860..d978b5f5937391799181e3a927317ec67b25b8b0 100644 (file)
--- a/gtk/gtkapplicationwindow.h
+++ b/gtk/gtkapplicationwindow.h
@@ -62,7 +62,7 @@ struct _GtkApplicationWindowClass
   GtkWindowClass parent_class;
 
   /*< private >*/
-  gpointer padding[14];
+  gpointer padding[8];
 };
 
 GDK_AVAILABLE_IN_ALL

diff --git a/gtk/gtkbin.h b/gtk/gtkbin.h
index b86bad52f02982063c700cdda7d91313bce0cf3c..72010a06e1cef3a881157cb49b5e120472921855 100644 (file)
--- a/gtk/gtkbin.h
+++ b/gtk/gtkbin.h
@@ -60,11 +60,7 @@ struct _GtkBinClass
 
   /*< private >*/
 
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
+  gpointer padding[8];
 };
 
 

diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index f092e40c86db9ba626c3c59c338a2303a5e069fd..e3dd79a0ac5766a3140e741ca56c4302f1fc9356 100644 (file)
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -89,15 +89,7 @@ struct _GtkContainerClass
 
   /*< private >*/
 
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
-  void (*_gtk_reserved5) (void);
-  void (*_gtk_reserved6) (void);
-  void (*_gtk_reserved7) (void);
-  void (*_gtk_reserved8) (void);
+  gpointer padding[8];
 };
 
 

diff --git a/gtk/gtkdialog.h b/gtk/gtkdialog.h
index 408bc61a4e09f2f6656707c291b1f70ef70254b0..056253041d3d3614a81d7437453ec5c190cd1d60 100644 (file)
--- a/gtk/gtkdialog.h
+++ b/gtk/gtkdialog.h
@@ -128,11 +128,7 @@ struct _GtkDialogClass
 
   /*< private >*/
 
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
-  void (*_gtk_reserved4) (void);
+  gpointer padding[8];
 };
 
 

diff --git a/gtk/gtktoolitem.h b/gtk/gtktoolitem.h
index 143db850531f334d7621bda627e4b9cb891fac38..6482a09e2004926ac509d6479c8b4526ee68a732 100644 (file)
--- a/gtk/gtktoolitem.h
+++ b/gtk/gtktoolitem.h
@@ -69,11 +69,7 @@ struct _GtkToolItemClass
 
   /*< private >*/
 
-  /* Padding for future expansion */
-  void (* _gtk_reserved1) (void);
-  void (* _gtk_reserved2) (void);
-  void (* _gtk_reserved3) (void);
-  void (* _gtk_reserved4) (void);
+  gpointer padding[8];
 };
 
 

diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 42a8021e8fab746498f6309f8c622264cfd05691..8e1024fade7868848e4339c19d54730f954559b8 100644 (file)
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -339,8 +339,7 @@ struct _GtkWidgetClass
 
   GtkWidgetClassPrivate *priv;
 
-  /* Padding for future expansion */
-  void (*_gtk_reserved7) (void);
+  gpointer padding[8];
 };
 
 

diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index 89e53656790e0bf06efa0725b56ee852a5953e3c..1d0766593e616831207a6096d7c62b9615599d6b 100644 (file)
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -81,11 +81,7 @@ struct _GtkWindowClass
   gboolean (* close_request)    (GtkWindow *window);
 
   /*< private >*/
-
-  /* Padding for future expansion */
-  void (*_gtk_reserved1) (void);
-  void (*_gtk_reserved2) (void);
-  void (*_gtk_reserved3) (void);
+  gpointer padding[8];
 };
 
 /**